Added back tests after review