Improve/unit tests