Removed funs and macros
Changed so most of the tests passed
removed error_logger print outs