Fixed old unit tests