Changed: cleanup invalid test statements