fixed some stuff - added more tests