Fixed tests problem

See issue #31