fixed failing tests
updated to reflect new directory structure
updated for new directory structure