Merge pull request #31 from matthesrieke/develop-epos

some unit test improvements
fix some critical issues, acting on code analysis