Fix aspects & add tests