Added UnitTests
Added index on file