Add more and better number testing