Initial tests and implementation