Fixed tests. Fixed #4