Added Tests & fixed indentation