Add tests + code trimming