Tests working, need to do manual tests