added slf4j and refractor some tests