+tests, updated beta features