Add new tests. Cleanup code. Update versions dependencies
version up