added tester, added return id functionality