more things wrapped up, more tests to come