add aspect mock and more tests