Small fixes and featured test