* Fixing startup script
* Fixed tests