FIX buildings testcase removes s now. ing should be removed next