Removes commented method
Additional test refactoring
Supports creating a prepaid subscription during finalize!