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