add more unit tests, - and /