Fixed class/variable names and added test