Updated unit tests for CI