Cr10s4 tests and mods

Created by: Canyon Paterson