first commit!
clean up some tests & duplicate code