Cleanup/tests

cc @lancejpollard