#119 Extra tests