Updated existing tests for better structure