Tests renamed and slightly refactored