moved more methods to static functions in tests