Added testing code without database