Fixed up failed unit tests