Fix/tests - Correct Unit Test Issues