Moved tests back up to the top level and avoid mysql/postgres specific tests for the moment.