cleaned up schema, started tests