Got unit tests working