Added the last couple of tests

Should be good to go now.