Moved static outside server for testing and seperation of concerns. Simple test are included
Merge pull request #2 from johnnybegood/Testing

Testing