remove getter/setter variants, complete flag variants, refactor tests