Little adjustements for tests