Dispose fix
Masteries dto issues fix
Unit tests update