Add bug fix to failing unit test when run on it's own