Restructure TestingAPI