refactored aspect mock, removed introductions with proxies