#10 Unit test fix