Restructuring tests and adjusting semantics