fix skipped tests; resolve a warning; progressive tidying

Why is this static? Not necessarily a problem, just curious.