Changed some tests. Added more.