Moving Tests folder. Getting Tests running independentaly.
Starting to refactor tests. Need to do something about Factory dependency.