Refactored and implemented some tests.
Ignored and implemented some tests