Improve/unit tests

This can be enabled again