Remove old, more tests, improve variant