#24 Fixed tests