Added Element Collection declartion. Fixed naming and test functions