Added tests for Issue #16
Added support for toupper function as requested in issue #13