Well that didn't work! Take some Test annotations back out. Also polish up a class I missed.