got tests passing again
merged