Bug fixes
First working test!