Increased unit test coverage + bugfixes