[DO NOT MERGE] Adding tests