structuring tests a bit better