Added test cases. Still stuck on evaluation issues.