Restoring build ability for demo and lib project, test is still undone for now