Initial attempt to get tests passing, thanks @vevix