Completed tests and initial implementation