Added base testing code