Updates tests

Updates tests to remove dependency on FactoryGirl and related code.