Updated docs
Cleaned up obsolete tests and move tests into seperate dirs
Re-adding tests in new dirs