Fix failing tests

These tests were marked `Explicit` => didn't get run automatically => didn't track changes to the SUT
Merge pull request #1 from JayBazuzi/fix-failing-tests

Fix failing tests