Continued putting together tests