Moved around code. Documented test classes