add test
add new platforms, change tests
Merge pull request #435 from mimmi20/issue-434

Fixes #434
update from master