refactor test layout, fix and add forma id1 query