make tests work
merged