Added tests, but for real this time