refactored test cases
updated test cases, now factored into components