Fixed some case issues
Updated tests