Adding attribute mapping aspect and fixing older tests