implemented Trade and JUNIT Tests and other stuff