#27 - improve test granularity