Major fixes & first Test