(Work in progress) More tests