some
move some macros around
concurrency tests and some more test stuff