More tests converted