Skip to content

Refactor tests

Refactor tests #641