Carlos Balderas added unit tests