fixing issues and continue testing