Minor tweaks
Moved test-folder to play nice with PhoneGap build