- Fixed some declaration problems
- Fixed some issue for the tests