Updated test programs - removed unnecessary classes (which avoids throwing a VerifyError when loading them)