Remove debugging
Update tests