Remove some more compiler warnings and deprecated test code