Added testing with old data