Fixing a broken test
Fixing another broken selector inside the tests
Some test fixes
Fixing fixture to prevent warnings in tests. Fixing selector that was breaking test.