fixing references and starting to test