more class name fails
remove superfluous files
get tests running ok