Small refactoring in test code.
Refactored test directory structure.
Default price calculator added.