Fixed folders and made tests available.
Cleanup stuff.
Oops.
Merge branch 'testandstuff'