Merge pull request #37 from rotty3000/master

simplify by auto resolving tests