Fixed index + Added Test Stubs