Restructuring the tests, more information to docs