Revert "Move test_floor0 in tests to a sub-folder"

This reverts commit bacdc2260005d79beafa3502205c2ed61338ceb3.

Reason for revert: automerger issues seen

Change-Id: I569946ff4642f9c01675db9d8aa612b8ebe94f02
2 files changed