adding more tests
fixing some minor things