Remove unimportant assert - HashMap can deal with null keys
Pass data Bucket to handlers
Change JUnit asserts to Java asserts so we can move the class to FCPClientReferenceImplementation