improve and bugfix manually tests