More hystrix testing, both integration test and fallback test. JUnit tests refracoring and cleanup