moved tests and modules out and seperated