renamed some tests, deleted unused lines, changed assertion method