Unit Tests and alterations