Added failing category markup tests.

Added calculateCategoryMarkup function definition.
Filled calculate category markup function body.

Tests are all passing now.
Added some failing calculate total markup tests.