A newer version with more tests