Eliminating Warnings

Added @Override, specified generics, eliminated unused fields (mostly loggers), moved ESFs from src/test/java to src/test/resources.