Fill out why-both tests a bit
Fill out matrix a bit