added more tests

commented out tests fail