adding and fixing some tests