less warnings
clean up warnings, remove unused variables
fix build of Test