Merge pull request #198 from Stefan-Hintz/master

modernize
XCTests