Some final touches and more tests