Fixing some fixtures and reverting use of Versioned active record until it can be thoroughly tested