Removed localization support, fix construction routines, update test