Fixed errors in unit tests