Simplified domain model using Lombok. Moved configuration classes into test source folder. Original pull request: #154.