Revise test modules and split into seperate files
Revise docs