added rest of tests