#36 Fixed tests