Separates Satoyama from API
Adds database tests