[Tests] Added some tests, modified others.