improved some tests