Restructure tests a little bit