First round of tests passing