Removed few stack trace prints, added few tests