Additional aspects module test cleanup