Cleaning up
Changed configuration style and updated tests