Fixed up Schema & working on tests