Refactored tests for Decomposition