Revised testing suite