refactored tests, and addded tests for -, *