remove some unused tests
add tests
update
update code based on comments Arthur left on Github