Added test-method stubs
Manual Merge