finished beta with tests