Get first two tests working