Fixes tests (and some details)