Adding test implementation