updated some tests, added more assertions