Broke tests, added more fixtes