Tweaked unit testing implementation, updated directory names for consitency with other projects