added some more tests, moved some more stuff to askfunc to write tests for tomorrow