Fixing some issues with fixtures and clearing tables in test
Updating test