More testing

Worked with test fixtures