Adding Tests

• Adding Tests
• Fixing Bugs