Added test
Added selector and entities stage with tests