Added tests for Eric Carrillo