More unit test fixing tests