fixed issues that caused unit tests not to run