Cosmetics, Adds some tests stubs

Minor refactor of then method for clarity