added relevant tests