Clean upp tests and remove unused code. #116