finish implementation of boolean mapping: get tests green