ticket:1 Fixed tests and removed fixture migration
ticket:1 Merged test fix