All (ah, well some) Add-tests passing