move piece-movement assertions to main.csp
cleaned up code