Update tests; upgrade to alpha2