Working on new testing suite
New tests template are working