Added test featgures and did some initial bug corrections