fixed my stuff. added a test