Fixing switch plug tests and fixing all the test feature as well, as everything was broken