Remove unused code and resources
Add additional test cases