test fix
Merged from smanousopoulos fork