Started working on generic tests.