Added help, added tests