Fixed some vars and some class
implementing first tests