Reorganise unit tests to get rid of warnings