Added in test, currently broken, but has code merged together