Add better handling of 500 errors
Removing accidentally added test temp data