added remaining initial modules including test cases