Refactoring Tests

Adding New Method plus Tests