Remove from/import, update to PHP5.4 and tests