Added test cases and SQLite database stuff
Merge remote-tracking branch 'origin/master'