Added 'site' getter/setter. Added 'language' getter. Enhanced tests.