Development

Fixed bugs and added modules tests for query builder