Edits to Module Names + add Tests