added more tests, added Container base class