Removed stubbed asserts, added additional tests for coverage