Fixed tests #17