Tests improved and readme