COmpleted logic functions unit tests, fixed other tests depeding on removed func macro