Refactor test suite

Remove code duplication
Better names