Add tests, change drawing in form