Added auto-testing