Fixed things
Test added.