restructuring the sql
org tests