FIXED tests (broken during housecleaning merge)