Hotfix to build again on travis ci
Adds more unit tests