Added more details to implementation and test spec