smarter alternate identification + added tests