Started adding tests. Nothing is done yet..