Add tests + work on levels