added a bug fix for no evaluating short codes
added test mode