Acceptance and unit tests for Matias Guierrez and Chia-Hua Kuo