reorganize tests
update to 1.2.0
Merge pull request #28 from Jonahss/master

Update to 1.2.0