add and fixed some tests