Fixes based on testing
Updating test fixtures
Updating testing