Testek, various changes