Moved tests & parser code around, added tests for arguments