re-organized tests