Issue 2: Improve tests