fixed non working tests, completed other tests