Added tests, need to make them pass