Added Web and Main module, fixed dao tests