removed test-context in favor of java config