Failing Unit Tests - attempt to fix