minor test updates (versioned some schemes, removed commented out code)