Issue #130 - Fixed tests