Add matrix testing with and without annotation. Now tests will run twice : once for each configuration.