Q3 with unit tests