fix skipped tests; resolve a warning; progressive tidying