-allFixed unit tests. Added @agentz suggestions.
Fixed unit tests. Added @agentz suggestions.