Updated body data
Moved test directory
Added a couple choice parameters
Merge branch 'master' of https://github.com/sbuggay/skr