Fix naming and adding tests