Corrections + Tests added and functional