Attempts to fix tests, no luck as yet