Fixes issues related to tests...