added resources and refactored test package