Few changes to Internals. Additional tests.