Removed site model, just create tests directly. Some work on views