Implemented new batch of tests