Made tests and did some ch* stuff