Restructure schema
Added test query