some another refactoring, also test remaked to use MeshDrawables