#146: Changed instruction vaidaton; added tests