Test: Increase coverage / add tests; Clean up, use extended method set for now;