Start testing framework.
Added new watertowers, cleaned up old ones.