COP and test cases

Just some edits to the test cases and COP calculations