put test back, debugging, todo