added test with mocked rest mvc server
cleanup; update config