Issue 50 update unit tests single expectation