change comment syntax
better test teardowns
supersede existing files