Added modules and test