refactor of test layer to use new adapters and clearer before/after functions to setup configs then clean them