Renamed some variables to camel case
Improved unit test
Fixture change