reflected simplified design from wfs connector, renamed some tests