Test numbers, parse locking, merge SugarJ language changes