Clean up of Unit Tests
Moving Test Resources to seperate package