Specific testings, minor issue fixes