Added testing for other databases