Added test directories, little cleanups