Included test module helpers and fixed specs