cleanup and fixing specs