Switched to case sensitive + unit tests