fixed/added tests