Update tests and fix lowerCase bug