First and dirty commit of working tests