#479 Finished API query creator, created some tests