added unit tests for Matias Gutierrez