Move controller tests into new folder
Add test for json definition
Move statement creator to statements js file