Small refactor and added first real tests