added joaquins unit tests