More number testing. Added unit tests.