fixing more tests and knockingout todos