Extend test coverage

DO NOT MERGE depends on #46

Needs to be rebased once #46 merged