change variable name
fix tests for marks; add more tests