Expanded cleanup function, alias added to sim class, expanded neumann tests