updated tests - may not all compile...