Better Testing environment, unfinished, though