cleanup to fbos, and moved a broken test file to correctness