Update tests and Constructor to new APIs