Added next portion of tests