Moved some tests to use snyc