Started some unit tests