- changed assertions to junit
- refactored