Added base files and tests