At least get tests compiling properly Still 7 or more failures, but at least we can build the dang thing now and avoid warnings in Eclipse Change-Id: I61a0488e46b5b89351c09633135343a3609812d1