fixes fixtures bug and cleans up testing