removed todo's
added more tests