Fixing bug in define function form where body was greater than one sexpr, added integration tests
Tidying up integration testing