eclipse warning cleanup, minor unit test additions