create tests + fix