reorganize test, fix failing test, add tests for prices