Add seperate basic and sql tests