Fix tests and update to beta 2
Fix conflicts