improve test and make them run sequentially