Changed the structure and added mocing to test