Getting most basic api test working
merging in master