Eliminated errors in unit tests