fixes #76, migrated associated tests