updated text
moved some tests