Added base testing