Fixing unit tests

@michaelp983