fixed some failed unit tests