alterning tests to support change of instanciation
getting rid of magic-number constants