#7 Further improve tests