Fixed unit tests with updated fixtures