Get unit tests working