Refactored configuration properties and added more tests