Tests fixed
builds added