Refactored Module Tests, now it should be nicer