Moved to MySQL
Cleaned up tests