organize test file and add a couple asserts