removed SOPs and added unit test