Updated unit tests with fixes. Travis should build successfully