re-arrange tests