Added the newly created test areas from v7 release back into the branch. It was somehow excluded.
Modified all the areas (including the newly added ones) to the correct data format provided by the documentation.
Refactored the code to make it more streamlined with many switch...case conditional checkings.

Also added in javadocs while I'm at it.
Updated to the latest /bin/ stuffs.