Fix #49 - cleaner unit tests