Updated tests and removed deprecated features