Added one integration test. Really think this is sufficient
Cleanup
Minor changes on the properties