Add Tests and removes