Closed #2: Added tests