Removed dead endpoints. More tests