Added Scale support and ended level tests