Add new tests. Cleanup code.