#89 Fixed tests