Fix unit tests; removed config macros and replaced with better impl.