Modified Tests module a lot